NexusPi Git Node
Commit e605e8fe8c3a2ea3d09e34e10b964c43ad4d5262
Parents : 4312594
Author : Ivan <e318cbc04468bd574db2b4523dddd710>
Signature : T66BB85Valid, signed by author
Date : 2026-08-15T17:26:39-05:00
feat: fix unify-backend script to support mirroring architecture-specific native libraries for consistency across builds
Changes
2 files changed, 27 insertions(+), 2 deletions(-)
Diff
diff --git a/meshchatx.rsm b/meshchatx.rsm
index 9e0f9759..6d78130d 100644
Binary files a/meshchatx.rsm and b/meshchatx.rsm differ
diff --git a/scripts/unify-backend-plain-files.sh b/scripts/unify-backend-plain-files.sh
index 0ea195c1..599b3c73 100755
--- a/scripts/unify-backend-plain-files.sh
+++ b/scripts/unify-backend-plain-files.sh
@@ -12,8 +12,8 @@ set -euo pipefail
ROOT="$(cd "$(dirname "$0")/.." && pwd)"
-ARM64_DIR="$ROOT/build/exe/darwin-arm64"
-X64_DIR="$ROOT/build/exe/darwin-x64"
+ARM64_DIR="${MESHCHATX_UNIFY_ARM64_DIR:-$ROOT/build/exe/darwin-arm64}"
+X64_DIR="${MESHCHATX_UNIFY_X64_DIR:-$ROOT/build/exe/darwin-x64}"
if [[ ! -d "$ARM64_DIR" || ! -d "$X64_DIR" ]]; then
echo "unify-backend: one or both backend dirs missing, skipping"
@@ -36,6 +36,23 @@ required_native_rel() {
return 1
}
+# Intel NumPy wheels ship OpenBLAS (plus gfortran/quadmath/gcc_s). Apple
+# Silicon NumPy uses Accelerate, so those dylibs are x64-only. Dropping them
+# to equalize the two trees makes numpy._core._multiarray_umath fail to
+# dlopen on the Intel slice. Mirror them into the other tree so
+# @electron/universal sees the same paths. x64ArchFiles keeps the backend
+# from being lipo'd, so the unused copy is never loaded.
+mirror_native_rel() {
+ local base
+ base="$(basename "$1")"
+ case "$base" in
+ libscipy_openblas* | libgfortran* | libquadmath* | libgcc_s*)
+ return 0
+ ;;
+ esac
+ return 1
+}
+
copy_missing() {
local src_dir="$1" dst_dir="$2" label="$3"
while IFS= read -r -d '' rel; do
@@ -53,6 +70,14 @@ copy_missing() {
echo " meshchatx.src.backend.bake_frozen_pycodec2 after each cx_Freeze slice." >&2
exit 1
fi
+ if mirror_native_rel "$rel"; then
+ mkdir -p "$dst_dir/$(dirname "$rel")"
+ cp "$src_file" "$dst_dir/$rel"
+ echo "unify-backend: mirroring arch-only native $rel ($label)" >&2
+ echo " source reports: $ft" >&2
+ synced=$((synced + 1))
+ continue
+ fi
echo "unify-backend: dropping arch-only Mach-O for consistency: $rel" >&2
echo " ($label); source reports: $ft" >&2
echo " Hint: this native library/extension only exists in one arch's" >&2
Served by rngit 1.5.2 - Generated in 0.02s